Since multiple people were working on the project, we decided to use Git branches for each team member to minimize conflicts. You can view the commit and merge history HERE. Towards the end, you may notice commits directly made to the main branch, as they were small adjustments that didn't warrant creating separate branches commits just to merge them immediately after.